bitkeeper revision 1.1159.1.517 (41d417bddbJQbGTNZdimylJpzcXpqQ)

build fixes

diff --git a/linux-2.4.28-xen-sparse/arch/xen/kernel/setup.c b/linux-2.4.28-xen-sparse/arch/xen/kernel/setup.c
index 3b27174ba66797150fe036443fa0e4b6c154c1b6..f08f3a4369be0004cfa39d16bb5c8b8472deae70 100644 (file)
--- a/linux-2.4.28-xen-sparse/arch/xen/kernel/setup.c
+++ b/linux-2.4.28-xen-sparse/arch/xen/kernel/setup.c
@@ -62,8 +62,8 @@ shared_info_t *HYPERVISOR_shared_info = (shared_info_t *)empty_zero_page;
 
 unsigned long *phys_to_machine_mapping, *pfn_to_mfn_frame_list;
 
-multicall_entry_t multicall_list[8];
-int nr_multicall_ents = 0;
+DEFINE_PER_CPU(multicall_entry_t, multicall_list[8]);
+DEFINE_PER_CPU(int, nr_multicall_ents);
 
 /*
  * Machine setup..

diff --git a/linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c b/linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c
index e3f345ac9b2871915538ec1f9845b66c3a8607a1..d10c749a1bd96e563d2cdcbec6b13d7c75309e73 100644 (file)
--- a/linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c
+++ b/linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c
@@ -62,6 +62,7 @@ static void vbd_update(void){};
 #define BLKIF_STATE_DISCONNECTED 1
 #define BLKIF_STATE_CONNECTED    2
 
+#ifdef VERBOSE
 static char *blkif_state_name[] = {
     [BLKIF_STATE_CLOSED]       = "closed",
     [BLKIF_STATE_DISCONNECTED] = "disconnected",
@@ -74,6 +75,7 @@ static char * blkif_status_name[] = {
     [BLKIF_INTERFACE_STATUS_CONNECTED]    = "connected",
     [BLKIF_INTERFACE_STATUS_CHANGED]      = "changed",
 };
+#endif
 
 #define WPRINTK(fmt, args...) printk(KERN_WARNING "xen_blk: " fmt, ##args)